Merge upstream version 30.2
authorRob Browning <rlb@defaultvalue.org>
Sun, 9 Nov 2025 19:36:42 +0000 (13:36 -0600)
committerRob Browning <rlb@defaultvalue.org>
Sun, 9 Nov 2025 19:36:42 +0000 (13:36 -0600)

Trivial merge